From f4fc70e3c72c3db162ce5d863020ece9b0aa7dbe Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Tue, 5 Sep 2000 12:13:24 +0000 Subject: [PATCH] Use g_path_get_dirname instead of g_dirname, which is deprecated. 2000-09-05 Sebastian Wilhelmi * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead of g_dirname, which is deprecated. (gtk_rc_parse_any): Removed calls to g_scanner_{freeze,thaw}_symbol_table, which are deprecated. * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): Removed calls to g_hash_table_{freeze,thaw}, as they are deprecated now. * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename instead of g_basename. --- ChangeLog | 14 ++++++++++++++ ChangeLog.pre-2-0 | 14 ++++++++++++++ ChangeLog.pre-2-10 | 14 ++++++++++++++ ChangeLog.pre-2-2 | 14 ++++++++++++++ ChangeLog.pre-2-4 | 14 ++++++++++++++ ChangeLog.pre-2-6 | 14 ++++++++++++++ ChangeLog.pre-2-8 | 14 ++++++++++++++ gtk/gtkbindings.c | 4 ---- gtk/gtkrc.c | 7 +++---- gtk/testtext.c | 2 +- tests/testtext.c | 2 +- 11 files changed, 103 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c413b9dd7..9207af691a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2000-09-05 Sebastian Wilhelmi + + * gtk/gtkrc.c (gtk_rc_parse_file): Use g_path_get_dirname instead + of g_dirname, which is deprecated. + (gtk_rc_parse_any): Removed calls to + g_scanner_{freeze,thaw}_symbol_table, which are deprecated. + + * gtk/gtkbindings.c (binding_entry_new, binding_entry_destroy): + Removed calls to g_hash_table_{freeze,thaw}, as they are + deprecated now. + + * gtk/testtext.c (buffer_pretty_name): Use g_path_get_basename + instead of g_basename. + 2000-09-04 Elliot Lee * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning. diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index a5af89ea07..37e82612a7 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -122,11 +122,9 @@ binding_entry_new (GtkBindingSet *binding_set, binding_set->entries = entry; entry->hash_next = g_hash_table_lookup (binding_entry_hash_table, entry); - g_hash_table_freeze (binding_entry_hash_table); if (entry->hash_next) g_hash_table_remove (binding_entry_hash_table, entry->hash_next); g_hash_table_insert (binding_entry_hash_table, entry, entry); - g_hash_table_thaw (binding_entry_hash_table); return entry; } @@ -205,10 +203,8 @@ binding_entry_destroy (GtkBindingEntry *entry) g_hash_table_remove (binding_entry_hash_table, entry); else if (begin != o_entry) { - g_hash_table_freeze (binding_entry_hash_table); g_hash_table_remove (binding_entry_hash_table, entry); g_hash_table_insert (binding_entry_hash_table, begin, begin); - g_hash_table_thaw (binding_entry_hash_table); } entry->destroyed = TRUE; diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index c31fc5062d..495fbbd411 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -679,8 +679,9 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload) /* Temporarily push directory name for this file on * a stack of directory names while parsing it */ - rc_dir_stack = g_slist_prepend (rc_dir_stack, - g_dirname (rc_file->canonical_name)); + rc_dir_stack = + g_slist_prepend (rc_dir_stack, + g_path_get_dirname (rc_file->canonical_name)); gtk_rc_parse_any (filename, fd, NULL); tmp_list = rc_dir_stack; @@ -1234,10 +1235,8 @@ gtk_rc_parse_any (const gchar *input_name, } scanner->input_name = input_name; - g_scanner_freeze_symbol_table (scanner); for (i = 0; i < n_symbols; i++) g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token)); - g_scanner_thaw_symbol_table (scanner); done = FALSE; while (!done) diff --git a/gtk/testtext.c b/gtk/testtext.c index 9a6059790a..f9c4bcaca9 100644 --- a/gtk/testtext.c +++ b/gtk/testtext.c @@ -1218,7 +1218,7 @@ buffer_pretty_name (Buffer *buffer) if (buffer->filename) { char *p; - char *result = g_strdup (g_basename (buffer->filename)); + char *result = g_path_get_basename (buffer->filename); p = strchr (result, '/'); if (p) *p = '\0'; diff --git a/tests/testtext.c b/tests/testtext.c index 9a6059790a..f9c4bcaca9 100644 --- a/tests/testtext.c +++ b/tests/testtext.c @@ -1218,7 +1218,7 @@ buffer_pretty_name (Buffer *buffer) if (buffer->filename) { char *p; - char *result = g_strdup (g_basename (buffer->filename)); + char *result = g_path_get_basename (buffer->filename); p = strchr (result, '/'); if (p) *p = '\0'; -- 2.30.2